Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treat ref-to-raw cast like a reborrow: do a special kind of retag #56741

Merged
merged 1 commit into from
Dec 20, 2018
Merged

treat ref-to-raw cast like a reborrow: do a special kind of retag #56741

merged 1 commit into from
Dec 20, 2018
+76 −128

Conversation

RalfJung
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Dec 12, 2018

I like how everything is more explicit. So this PR lgtm, but without the corresponding miri-PR it's kind of hard to gauge the effect.

I'm fine with just r+ing this PR, since I'm gonna see the changes to miri later, but we might end up having to cycle back to rustc changes (unlikely though).

@RalfJung RalfJung mentioned this pull request Dec 12, 2018
Closed
@RalfJung
Copy link
Member Author

The corresponding miri PR is at rust-lang/miri#571

@oli-obk
Copy link
Contributor

oli-obk commented Dec 12, 2018

The corresponding miri PR is at rust-lang/miri#571

thx

@bors r+

@bors
Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 73d33fb800e4baf909c84974075dd008da4194b4 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 12, 2018
@RalfJung RalfJung mentioned this pull request Dec 12, 2018
Merged
@oli-obk
Copy link
Contributor

oli-obk commented Dec 12, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 97b17d7dfb6ad0f6d998b14fe11c0ef8f68db47f has been approved by oli-obk

@RalfJung
Copy link
Member Author

Sorry forgot to update the lockfile.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 29ef9d2a7bf0e6386997065f60b96b28b55987c4 has been approved by oli-obk

@RalfJung
Copy link
Member Author

I removed the miri update for now because it's broken anyway.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 16, 2018

📌 Commit 73d33fb800e4baf909c84974075dd008da4194b4 has been approved by oli-obk

@Centril Centril mentioned this pull request Dec 16, 2018
Merged
bors added a commit that referenced this pull request Dec 16, 2018
@bors
Auto merge of #56875 - Centril:rollup, r=Centril
a8a2a88 
Rollup of 20 pull requests

Successful merges:

 - #53506 (Documentation for impl From for AtomicBool and other Atomic types)
 - #56343 (Remove not used mod)
 - #56439 (Clearer error message for dead assign)
 - #56640 (Add FreeBSD unsigned char platforms to std::os::raw)
 - #56648 (Fix BTreeMap UB)
 - #56672 (Document time of back operations of a Linked List)
 - #56706 (Make `const unsafe fn` bodies `unsafe`)
 - #56742 (infer: remove Box from a returned Iterator)
 - #56761 (Suggest using `.display()` when trying to print a `Path`)
 - #56781 (Update LLVM submodule)
 - #56789 (rustc: Add an unstable `simd_select_bitmask` intrinsic)
 - #56790 (Make RValue::Discriminant a normal Shallow read)
 - #56793 (rustdoc: look for comments when scraping attributes/crates from doctests)
 - #56826 (rustc: Add the `cmpxchg16b` target feature on x86/x86_64)
 - #56832 (std: Use `rustc_demangle` from crates.io)
 - #56844 (Improve CSS rule)
 - #56850 (Fixed issue with using `Self` ctor in typedefs)
 - #56855 (Remove u8 cttz hack)
 - #56857 (Fix a small mistake regarding NaNs in a deprecation message)
 - #56858 (Fix doc of `std::fs::canonicalize`)

Failed merges:

 - #56741 (treat ref-to-raw cast like a reborrow: do a special kind of retag)

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 16, 2018

☔ The latest upstream changes (presumably #56875) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 16, 2018
@RalfJung
Copy link
Member Author

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 18, 2018

📌 Commit c1160a8 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 18, 2018
@bors
Copy link
Contributor

bors commented Dec 20, 2018

⌛ Testing commit c1160a8 with merge 4755e2f...

bors added a commit that referenced this pull request Dec 20, 2018
@bors
Auto merge of #56741 - RalfJung:retag-to-raw, r=oli-obk
4755e2f 
treat ref-to-raw cast like a reborrow: do a special kind of retag

r? @oli-obk

Cc @nikomatsakis
@bors
Copy link
Contributor

bors commented Dec 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 4755e2f to master...

@bors bors merged commit c1160a8 into rust-lang:master Dec 20, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #56741!

Tested on commit 4755e2f.
Direct link to PR: #56741

💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 20, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#56741!
3a778dc 
Tested on commit rust-lang/rust@4755e2f.
Direct link to PR: <rust-lang/rust#56741>

💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@RalfJung RalfJung mentioned this pull request Dec 20, 2018
Merged
@bors bors mentioned this pull request Dec 20, 2018
Merged
@RalfJung RalfJung deleted the retag-to-raw branch January 9, 2019 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RalfJung @oli-obk @bors @rust-highfive